(Ffont_spec): Check arguments.

diff --git a/src/ChangeLog b/src/ChangeLog
index e5516d26619827912284e7f3dc3ce033194ed54c..5e86ae6dd5692255cc323692f8365f1c19c8ca4f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-15  Kenichi Handa  <handa@m17n.org>
+
+       * font.c (Ffont_spec): Check arguments.
+
 2009-05-14  Chong Yidong  <cyd@stupidchicken.com>
 
        * xfaces.c (tty_supports_face_attributes_p): Recognize unspecified

diff --git a/src/font.c b/src/font.c
index cdff0d678e6027d14867c74238164f97f6dcc216..19bc70dd976712ccec6c5ee1baa095c08646b8f4 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -4007,7 +4007,12 @@ usage: (font-spec ARGS...)  */)
 
   for (i = 0; i < nargs; i += 2)
     {
-      Lisp_Object key = args[i], val = args[i + 1];
+      Lisp_Object key = args[i], val;
+
+      CHECK_SYMBOL (key);
+      if (i + 1 >= nargs)
+       error ("No value for key `%s'", SDATA (SYMBOL_NAME (key)));
+      val = args[i + 1];
 
       if (EQ (key, QCname))
        {